Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rework make realinstall and uninstall #3435

Merged
merged 1 commit into from
Jun 4, 2020

Conversation

rusty-snake
Copy link
Collaborator

  • remove -c, the manpage says it is ignored
  • $(DESTDIR)/$(bindir)/. -> $(DESTDIR)$(bindir) and so on
  • install contrib by file glob (*.py, *.sh)
  • split long lines

 - remove -c, the manpage says it is ignored
 - $(DESTDIR)/$(bindir)/. -> $(DESTDIR)$(bindir) and so on
 - install contrib by file glob (*.py, *.sh)
 - split long lines
Copy link
Collaborator

@glitsj16 glitsj16 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Comment on lines +130 to +136
if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d ]; then \
install -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d \
fi
install -m 0644 etc/apparmor/firejail-default $(DESTDIR)$(sysconfdir)/apparmor.d
if [ ! -d $(DESTDIR)$(sysconfdir)/apparmor.d/local ]; then \
install -m 0755 -d $(DESTDIR)$(sysconfdir)/apparmor.d/local \
fi
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reasons why we need to check this?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reasons why we need to check this?

Doesn't make much sense to me as the other install -d commands don't do that.

They are set to be removed on commit 5430535 ("build: stop checking for dir
existence on install", 2024-05-21) / PR #6366.

@rusty-snake rusty-snake merged commit dae3933 into netblue30:master Jun 4, 2020
@rusty-snake
Copy link
Collaborator Author

Still present: #3435 (comment)

@rusty-snake rusty-snake deleted the rework-make-1 branch June 4, 2020 10:41
rusty-snake added a commit that referenced this pull request Jun 4, 2020
revert long-line split and fix bash-completion
@matu3ba matu3ba mentioned this pull request Oct 7, 2021
kmk3 added a commit to kmk3/firejail that referenced this pull request Jun 2, 2024
And remove the extraneous semicolon at the end of the command string.

See also commit dae3933 ("rework make realinstall and uninstall
(netblue30#3435)", 2020-06-04).
kmk3 added a commit to kmk3/firejail that referenced this pull request Jun 2, 2024
Changes:

* Remove / after `$(DESTDIR)`
* Remove useless -c
* Use 0755 instead of 755
* Use -d after -m

See also commit dae3933 ("rework make realinstall and uninstall
(netblue30#3435)", 2020-06-04).
kmk3 added a commit to kmk3/firejail that referenced this pull request Jun 2, 2024
Changes:

* Remove / after `$(DESTDIR)`
* Remove useless -c
* Use 0755 instead of 755
* Use -d after -m

See also commit dae3933 ("rework make realinstall and uninstall
(netblue30#3435)", 2020-06-04).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants